Refactoring, bugs and raises