cleaning up the commented code