Modified some variable names and added some utility init funcions