Minor refactoring
Minor refactoring

walmartlabs/lovebeat,boivie/lovebeat,magnusbaeck/lovebeat,boivie/lovebeat,magnusbaeck/lovebeat,boivie/lovebeat,magnusbaeck/lovebeat,boivie/lovebeat,walmartlabs/lovebeat,walmartlabs/lovebeat,walmartlabs/lovebeat