Surface was applied to humanoids; some refactoring