A few changes based of code review