cleaning + improving make check