review code, minor improvements, clean stale stuff