Cleaned up formatting changed the includes and everything compiles