Fixes for section field folder (and code formatting)