bug850572: some cleanup from code styling