Refactored few methods. Removed outdated TODO.