removed commented-out code, moved formatting into the right place