Minor changes on Style