Unwanted imbrication and seems to be code duplication