Miscellaneous Refactoring