Clean ups suggested Lev Levitsky (@levitsky).