Improved windmills, refactored code