Removed the feature testing from each executed method and made these methods proper to the given environment

For better maintenance and to prevent a systematic `if` when a method is called.