cleanups/comments