Tiere/ar rerefactoring

- All lines are now 80 cols or less.
- Code looks better.
- Some methods are more generic and are used more.