Cleaning up *whistle whistle*