Simplify the whole file a bit while touching it

Change-Id: I72a63b894ce03122d3de4eaa63cfe24e4fb485f1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>