Removed short hand function calls

Removed short hand function calls to direct prototype calls