Cleanup
Thread Safety
Added missing javadocs