applied camel case to some var names