hübsched up code and fixed comments