Missig headers, formatting and cleanup.