Implement findKey and findIndex helpers
Style tweak and testing