Fixed some issues with return value and function name in header