cleanup and vs styles