Refactoring and function signatures.