Removed some commented out code. Enforced 80 line mac