improved code (syntax only) according to 'code conventions'