#5 cleanup of layout and indentation