Added comments and fixed order of includes to be consistent.