tiny bugfix/cleanup