Preview: Minor clean up