Refactor map feed to conform to Angular best practices