Cleaning a bit, preparing to implement 'Aspects'
-fix for entity's container method