[Newbies] refactoring