Big style cleanup