Refactor methods to use arrayMap