SW-32

Cleaner form