Fb code cleanup 1

This will need to be selectively merged with the master branch. This is where my knowledge of Git fails me.