#10601 - better code formatting?