Refactor of Bound Policing