bugfix
minor cleanup