Refactoring
slight refactoring