Bonus Landscape
Code cleaning