Cleanups to make the app more generic