Improved folding style