Started functions refactoring