Moved some functions around so that instead of a function pointer a function
call is used. This enables inlining of functions which reduces number of function calls.