cleanup
better typing