Removed commented out code and added comments