cleaned up in commnets