Moved function declarations to header file