Cleaner entity component architecture. part 3