Changed Cipher to static class