minor cleanup
minor layout changes