Cleaned up some of my code