minor cleaning Model