whitespace & preparation fixes