cleaned up, removed commented lines