cosmetic changes
efficiency improvements in third-order solution