first refactor commit
things are looking so much better now
I think things are looking much better now