deleted whitespace, cleaned up commented out code