Refactor and Code review changes