General cleanup, comments