cleaned up the code
cleaned up more