Cleanup of H files and main.c