Cleanup, small updates