General cleanup after jacob's code review