Refactor with map and select methods