Readbility improvement by some refactorings
Merge branch 'master' of https://github.com/IzumiSy/TabStocker.git