cleaned up and shortened code
cleaned up and shortened code
cleaned up and shortened code