Cleaned up nb