cleaup & TODO comments