Refactor

should improve your CC score a bit :heart: 

/cc @wallerjake 
Since value isn't set at this point won't it always be empty? Therefore default will never be used?