Code refactoring .....