Solved challenge 136
Simplified and optimized solution for challenge 136