make #scrutinizerci happy and added some coding style improvements