Cleaned up code some.