Changed some function signatures as some functions were declared
unncessarily static.