Making function declarations consistent