Some last changes for the night, formatting like mad