Tidying up the codebase

Last updated