Clarify, comment, clean