More var nameing conventions enforce
And should be all cleaned up and working
Finally