diff --git a/src/srvgrp-device-power.adoc b/src/srvgrp-device-power.adoc
index 36e7915..5bfa295 100644
--- a/src/srvgrp-device-power.adoc
+++ b/src/srvgrp-device-power.adoc
@@ -31,25 +31,62 @@ The DEVICE_POWER services take a 32-bit integer identifier known as `DOMAIN_ID`
 to specify the device power domain. These `DOMAIN_ID` identifiers are sequential
 and start from 0.
 
+The following table lists the services in the DEVICE_POWER service group:
+
+[#table_devpower_services]
+.DEVICE_POWER Services
+[cols="1, 3, 2", width=100%, align="center", options="header"]
+|===
+| Service ID
+| Service Name
+| Request Type
+
+| 0x01
+| DPWR_ENABLE_NOTIFICATION
+| NORMAL_REQUEST
+
+| 0x02
+| DPWR_GET_NUM_DOMAINS
+| NORMAL_REQUEST
+
+| 0x03
+| DPWR_GET_ATTRIBUTES
+| NORMAL_REQUEST
+
+| 0x04
+| DPWR_SET_STATE
+| NORMAL_REQUEST
+
+| 0x05
+| DPWR_GET_STATE
+| NORMAL_REQUEST
+|===
+
+[#section-power-state]
+Power State Format::
+
+The power state is represented as a 32-bit value. The following table shows the
+encoding for the power state.
+
 [#table_devpower_powerstate_data]
-.Power States Encoding
+.Power State Encoding
 [cols="2, 1, 5a", width=100%, align="center", options="header"]
 |===
-| POWER_STATE
-| Field
+| Bit
+| Name
 | Description
 
-| POWER_STATE[31]
+| [31]
 | CONTEX
 |
 	0b0: Context is preserved
 	0b1: Context is lost
 
-| POWER_STATE[30:16]
+| [30:16]
 | RESERVED
 | _Reserved_ and must be `0`.
 
-| POWER_STATE[15:0]
+| [15:0]
 | VALUE
 |
 [cols="2,5", options="header"]
@@ -77,35 +114,6 @@ and start from 0.
 !===
 |===
 
-[#table_devpower_services]
-.DEVICE_POWER Services
-[cols="1, 3, 2", width=100%, align="center", options="header"]
-|===
-| Service ID
-| Service Name
-| Request Type
-
-| 0x01
-| DPWR_ENABLE_NOTIFICATION
-| NORMAL_REQUEST
-
-| 0x02
-| DPWR_GET_NUM_DOMAINS
-| NORMAL_REQUEST
-
-| 0x03
-| DPWR_GET_ATTRIBUTES
-| NORMAL_REQUEST
-
-| 0x04
-| DPWR_SET_STATE
-| NORMAL_REQUEST
-
-| 0x05
-| DPWR_GET_STATE
-| NORMAL_REQUEST
-|===
-
 [#device-power-notifications]
 ==== Notifications
 This service group does not support any event for notification.
@@ -166,8 +174,8 @@ described in <<device-power-notifications>>.
 
 ==== Service: DPWR_GET_NUM_DOMAINS (SERVICE_ID: 0x02)
 This service is used to query the number of device power domains available which
-can be controlled by the client. The number of domains returned can be less than
-the actual number of domains present with the platform.
+can be controlled by the client. The number of domains returned may be less than
+the actual number of domains present on the platform.
 
 [#table_devpower_getdomains_request_data]
 .Request Data
@@ -213,7 +221,7 @@ This service is used to query the attributes of a device power domain.
 
 [#table_devpower_getattrs_request_data]
 .Request Data
-[cols="1, 4, 1, 6", width=100%, align="center", options="header"]
+[cols="1, 3, 1, 6", width=100%, align="center", options="header"]
 |===
 | Word
 | Name
@@ -228,7 +236,7 @@ This service is used to query the attributes of a device power domain.
 
 [#table_devpower_getattrs_response_data]
 .Response Data
-[cols="1, 4, 2, 6a", width=100%, align="center", options="header"]
+[cols="1, 3, 2, 6a", width=100%, align="center", options="header"]
 |===
 | Word
 | Name
@@ -240,7 +248,7 @@ This service is used to query the attributes of a device power domain.
 | int32
 | Return error code
 
-[cols="7,5", options="header"]
+[cols="8,5", options="header"]
 !===
 ! Error Code
 ! Description
@@ -259,7 +267,7 @@ This service is used to query the attributes of a device power domain.
 | _Reserved_ and must be `0`.
 
 | 2
-| TRANSITION_LATENCY
+| TRANS_LATENCY
 | uint32
 | Worst case transition latency of domain from one power state to another, in microseconds (us).
 
@@ -293,8 +301,8 @@ This service is used to change the power state of a device power domain.
 | This field indicates the power state to which the power domain should
 transition. The specific power states and their meanings may vary depending on
 the implementation, but generally, they include values such as "ON", "OFF"
-and vendor specific power state. See Power States description in the
-<<table_devpower_powerstate_data>>.
+and vendor specific power state. See <<section-power-state, Power State Format>>
+for more details.
 |===
 
 [#table_devpower_setstate_response_data]
@@ -384,6 +392,6 @@ This service is used to get the current power state of a device power domain.
 | uint32
 | This field indicates the current power state of the specified domain. The
 power state can be one of several predefined values, such as ON, OFF, or vendor
-specific implementation. See Power States description in the
-<<table_devpower_powerstate_data>>.
+specific implementation. See <<section-power-state, Power State Format>>
+for more details.
 |===