Cleaned up into comments