JL and JL Refactoring