34 Minor clean up