Cleaned up all files to a standard