Code nitpicks