Improvements

Remove `:s` because this method must be available outside.