Tidying, formatting & file order