Change indentation and whitespace

Change indentation of `extend` and `with` clauses to two spaces instead
of four. Removed some empty lines.