Remove comment options

+ replace spaces with tabs