Comments : Things i would change....