Minor clean up..