Restructured and commented settings