Cleanup
Added optional ID to Entity class #3