Tidying up first optimisation
This change pretties up years and tidies yard_logic