Cleaning up Entity a little. Neat code is good.