Revert "Appyling code review feedback"

This reverts commit b38897c64bbc3fcd853a2f71547a20152936f98e.
Revert "Revert "Appyling code review feedback""

This reverts commit 88130a14298dd848d2f9f5284b773dcb445df56b.