refactoring & raises