Some cleanups.

Signed-off-by: Horváth Balázs <q@qroa.ch>