cleaned up some the code