More cleanup + javadocs