Reorganized methods throughout controllers