Misc Refactors