polish
cleanup
spent way too much time on this