Refactor and clean up the code and update the default ConVar values