reorder everything to pythonize the app