Fix formatting and remove unnecessary includes