Refactor

should improve your CC score a bit :heart: 

/cc @wallerjake