Make resulting models code more PSR compatible