Refactoring (Utils package created)