cleaned up headers and code quality