Header files and cleanups