General cleanup and more comments