Fixed face detection and cleaned up