did some cleanup
did merge