cleanup, commenting