Patience is a gift and perfection a goal. Minor refactors in favor of consistency