Dune course is approaching, time to clean things up. This MR allows us to better review and comment on the code.