Clean up comments and change `tab` to read `app`