Some formatting + comments