Cleaning up the KISS example