Code beautifying take 2.