rename method + remove extra db call