moved to keep structure clean