made the code even drier!