clean up, get tests passing