Not sure what else to optimize. Cleaned up a bit.