Housekeeping, code style