Cleaned up some of the code