Changed function delarations to be consistent.