Resolve Formatting issue