Coding style fixes
Solution of Bart van Deenen added
Solution of Bart van Deenen added
Coding style