Code refactoring and cleaning. Improved version not focused on functionality but on code readability and technical debt reduction.