..refactored some more :-)