Shorter code, removing duplication, adding TODO: