Code cleanup and typography