Refactor station class