Some Refactors