niceing comments and cleaning up a little bit