Polishing up a few bits - refactoring only