refactor(All Modules):Refactor all modules by breaking up into smaller and cohesive functions.