A little reactoring...
A little reactoring...