Improves style, and fix #11