Code cleanups

Signed-off-by: Pekka Enberg <penberg@iki.fi>