Made some changes based on feedback and trying to adhere to the coding standards