style improvments