Core: Code style

Change-Id: I1f3d27ab921d1a2274a7db2c3e71f5122de99917
Reviewed-by: Eike Ziller <eike.ziller@digia.com>