Less type conversions
General cleanup