Just small tweaks

I mostly just cached objects from repetitive get calls. A common function was refactored. Not much really.  :)