Cleanup in Persitence class. Added javadoc