Several changes on style