optimize some tiny things