rearrange methods for logical grouping