Minor refactors
Minor refactors cont.