Housekeeping for code readability