Make skip code slightly nicer