Minor formatting + comments