remove 'long'; always use 'int' for consistency