some refactors to make the code more readable #136
+73
−47
Merged
Loading