Coding standards, cleanup based on code review.