Some style issues fixed