Entity updates/Code cleaning