Fixed formatting and style issues