Refactoring + UI