Clean up whitespaces and coding style issues.
Merge-request: 229 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>