cleaned up code and added more comments