refractor

Refactor code following best practices and design patterns