some small tweaks; convert all indents to spaces