updating comments and spacing