Extracting methods to be more concise
Merge branch 'abstractj-refactor'