Function calls refactored