Max&Michal: Minor clean-up