Improve contorl error. Remove dirty prints