massive style cleanup