Misc Refactorings