Cleaned up code more, removed commented out lines of code that will never be used, added some comments