cleaning up a bit more
trial and error now