Minor clean up of SVC