cleared comments, fixed formatting