Improved formatting and comments

Change-Id: I887bda7849d19d5be346137efaa6f98ba292abbf