Refactored codebase!!