fix naming and float => int