Refactoring Miscellaneous block