rearrange methods for legibility