Fixed comments and spacing