Continued development - Refactoring