Minor sytnax changes and removed unused style.