Reworked to_s. closes #2