Fix it up again, and comments for clarity