knf and whitespace fixes.