Refactors for doubled up variable