Issue #77: Moved more methods to Algorithm.java