Java convetions fixes, serializable IDs, removed weird import.