UC-53 Reorder methods and add docs