Make legacy code clearer