Clarify comments; Spacing.
Include based on class existing to avoid include/check performance issues