Feature/refactor hello