Refactoring all modifier functions.