some cleaning + test coverage up