fixed comments and spacing