Moar tidying of Face