- Small refactor of Factory.java