Simplified some code in Leonard.
Simplified some code in Leonard.

daviddeng/azrael,olitheolix/azrael,daviddeng/azrael,olitheolix/azrael,daviddeng/azrael,olitheolix/azrael,daviddeng/azrael,olitheolix/azrael,daviddeng/azrael,olitheolix/azrael