Cleanup and took care of some variable naming conventions