various fixes regarding coding guidelines issues