cleanup
cleaned up code