Code refactors
Code refactors