Optimize some tweaks

lolz