#48 refactoring Base: cleaning shape of body