Refactor Dev.java