Minor code refactor
Minor tweak