Changed to standard variable naming style
removed unused file