Address code review comments and clean up