Some effeciency tweaks.