tested/cleaned up
cleaned up more