Added some comments and cleaned up policy finder