Made the code even simpl