Cleaning up some of the easier functions. Also getting rid of a few that were simple to do inline.