General cleanup and comments