And trivial whitespace fixes.
Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: NDmitry Torokhov <dtor@mail.ru>