Refactoring

#1