video 25 / code refactoring