Fairly clean overall, just need to add the very small optimizations.