some code restyling