remove header include, spacing