removed camel case
changed every long to int