Slight clean up and shoehorn Per into bad land