some clenup
int -> long