Made some of the smaller functions just one line