Fix I7c0796219bd8b842e7207f6f8a5dec380f576287

* Don't make static calls for dynamic methods (!!!)
* Coding conventions
* No point in returning anything from validateClaim() as it's either true or exception

Change-Id: I1e3574c574dad1ecd993402d47e45da286c0f00e