Better comments.
More concise error handling.