Removed some unnecessary code from the improvement