Fixed per review comments.