Refactoring

ref #267