Removed the 'entity' prefix on all entity variables. Some minor refactoring and comment updating as well.