Fixed derp with previous commit. Cleaned up some code.