cleaning changes #1