just minor cleanup, not sure if I like