Refactoring and playing around...