bugfix, cleanup, comment