! General cleanup, no function changes