refactoring #5

Closed rotchotcho closed 6 years ago