Cleaned up code a little, in case people come to look at it. -EB