Code refactorring...