clean up
Fixed errors and cleaned up