Code style housekeeping