Make code compile - minor layout twiddels