Cleaned policy class