Second commit for refactor codebase