Performed some minor refactors.