Code sniffer cleanup

perhaps put an `@TODO`