fixed indents, some style changes