Some cleanup and important comments.