Anothern late night commit, cleaned up header and function naming