Formatting fix and another TODO