Cleaned up code at end of file.