Reordered methods and updated documentation