Some clean up- now using the helper class.