Some Formatting issues resolved