Housekeeping and code embelishment