Fixing typoes and alignment issues