Removed some commented out code, formatting