~ refactoring / clean-up