Move comments a little to enable copy & paste follow along