formatting tweaks
change: switched to Edition naming scheme