Cleaned up as per review comments.