Cleaned up the code of 11.