Cleaning up commented out code and spacing.