Initial commit - Refactor