Made to_s prettier
Refactoring to reduce lines per method
Removed redundant returns and nil