Topic

refactoring