Tidying up some processor code

This is not backwards compatible