Added questions on refactoring