cleanups: replaced some potentially dangerous ":"