fixing style issues, not yet complete