Added echo convars + cleaned up code