Generally code tidying before rebuild