s3ve3g: Clean up a bit