code cleanup

Change-Id: I64a47e2904c36b0299846ecc58cbcb5a07beac89
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>