formatting
fixed two bugs found using clang++ on OS X yosemite