Clean up knock_knock a little