Refactor Sprint | Clean code & better structure