Formatting updates and got rid of some bad commments