Code refactoring - more TODO.