Undo some unneeded botlib changes
Add some newlines to match Spearmint