Tidy and removal of some code smells (though by no means all).