start fixing style