added more states and removed unnecessary comments