Add comments and cleanup whitespace