Add repr ics and refactor things slightly