yes you are right.
will clean up a bit