Crypto code review, static methods added, lots of code cleaned up & static methods added