Improve 82-main style