Small fixes
Small fixes in coding style