Gave better names to some variables..