Minor refactors and updates