clean up
streamline behaviour a little more