Refactorings

Just put these in sequence...