fixed various style issues