Making some changes based on review feedbacks.