Code cleanup
With Crouton!