Formatting issues resolved