Refactoring + preview