1304301605

refactoring #1