justj-10: Refactoring