-Cleaned up code and files a little bit