Code house-keeping