cleanups and koments