Rearrange methods for better readability