made small functions into one liners