ok
cleaned up a little bit