restyling. New bugs found :(