Add code comments. Clean up an :if expression