moved comments and removed commented code