restructure mutable definitions