Codebase

Refactored code