Nitpicks: formatting, commented-out code