Format
Completed unprotected version without jasypt
Typo
Namespace cleanup