Some code restyling