Tidied up ConstructInterpretter based on feedback from rubocop