shrpx: Code cleanup