removed and coding style fix