removed excess commented code and did code layouts