Code refactoring a.k.a //change this later.