cleaned up indents, other code styling