A bit of clean up, fixed the trad || tr bug. Renamed some methods to be DRYer