- Code refactor and cleanup.