Clean some code based on coder module review.