Code cleanup. More concise. Less overly-descriptive comments.