cleaned up and put into order