Housecleaning, source formatting, compiler warning