changed naming convention to underscores instead of camel case