cleanups
further cleanups and clarifications