Cleaning up files and code