Reorganize methods