Bit of Code Cleanup. This should make it much faster.