cleaning an minor bugfixing