just some small cleanup and comments