Refactor
Fix #334