better repr and cleaning up