Keep comments in synch with the code