Small refactoring for slots
Merge pull request #24 from blackwithwhite666/master

Small refactoring for slots