Clean up tabs
Merge https://github.com/DonCox/Ribbit