Some Refactorings, Javadocs, Output Beautifications