Housekeeping and formatting updates