cleaned up a little, working