Huge commented out code section removed. Also small indent fix