Fix bugs by getting rid of a bad idea. Tighten up styles.