Code cleaned (avoided implicit conversions)