indent and layout fixes