More code snippet readability cleanup