Refactoring + startup script.