Cleaned up code.  Complete.