Adds slight refactoring