Code refactor

No new features