STY: style changes
various changes