Addressed Code Review feedback