Remember code foldings
No duplicate folds
New ace build and folding logic
Remember code folding - #27
Less lines
Even better folding - #27
Cleanup