MAINT: Minor style fix and integer conversion optimizations