Total code restyling, import optimization