Code Cleanup, make things a little more efficient.