I just cleaned up the class a little.