More optimizations! Yay CS 2150!