Cleaned up and updated inspect