Reverting change made in 3625f29, made the code more clearer as well