Refactoring gas class