cleaning it up with comments