Fixed major formatting issues