removed commented out stuff, formatting