Code refactoring & code review changes.