Problem Five cleaned up some