Split patients#index and general clean up