Clean-up

Better code
Merge branch 'Life-Goals-Activity' of https://github.com/bierlingm/Xonfire into Life-Goals-Activity