Fix formatting and redundant include