cleanup, remove hard coded details