Fixed comments and general formatting