Remove unnecessary Number conversion
Code conventions