Applied suggestions so far.