Remove further code duplication