cleanup indents and stuff