Code clean up
Typography & cleaning up