Couple of modifications without much thought :)