More javadoc,
More comments,
Better variable naming
Minor refactoring