More code cleaning to make things look more presentable.