renamed all class initialisation variables to an '_' underscored verson

Tested and working fine