Tidying up some engine code