Further code cleanup
Dp and Pixel conversions now return int instead of float
reverted back to float