Cleaned up the files a bit