cleaning up with comments