Static cleanup hopefully the last one

This is another batch of code trying to bring the codebase closer to one specified in the StyleGuide. It is too late for me to have much confidence in myself so i thought i would put it up here for review.