style changes & fix #11