cleanup yellow code, add toString for easier debugging, javadoc