Minor clean up + fix doc warning