Do some refactoring with the Gauge class

Started #36