Cleaned up my code and divided up 2 into individual files