minor changes + whitespace