Format fixes
Simplify
Use CAnL instead of java-security