Fixed up policy, naming, code, etc