Refactor vemode component and renamed method