fixed formatting and normalization