Changed argument names and made repr functions more powerful