Fixed any defects identified in our code review