Cleaned up regarding pr comments.