Refactor Stage finished

Fixed #26