Minor refactoring.
Minor refactoring.

olasitarska/slacker,wasabi0522/slacker,techartorg/slacker,kashyap32/slacker,BetterWorks/slacker,hreeder/slacker,dastergon/slacker,os/slacker,STANAPO/slacker,wkentaro/slacker