Fixed codestyle by removing extra assignments