Changes to the functions and header

Cleaning up based on some recent project feedback.