Moving mathematical closures into separate classes