Formatting changes to be in compliance with code standard