New solution
Code style