Fixed null bug, cleaned up code

* Fixed nullException bug caused by improper lazy instantiation 
* Cleaned up class/variable naming to make it more standard