Minor refactor.
Minor refactor.

pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch,pauldoo/scratch