Refactor, improve javadocs