switch to native trim + code formatting