Removed some commented out code and empty lines