Code style fix and removed uneeded variable