refactoring
Merge pull request #1 from halcat0x15a/refactoring

refactoring