maded some cleanups