Untabify and fix #11