moved reusable definitions under a single element