Fixed formatting and comments