Cleaning up some old out-dated styles