Improvements here and there, mostly making sure tests PASS #580
Almost there (at least for the strict refactoring, still +1d ETA for fixing the rest of the code) #580
Cosmetic