Tidying: massage to project coding style