re#141 coding style cleanup