cleaned up a wee bit