added depth/1 also clean up, dialyzer runs clean