Some refactor and cleanup and added support for selecting encryption key size