General en clean up

This is a general clean up of the en version.