Style formatting fix and todo comment