Ctrl + B refactoring and bugfix