Cleaned up some code and simplified things