+Priyanka Refactoring Continues. WIP