cleanup from feedback