and bit more clean up