fixed formatting/comments