Efficiency tweaks :3