Cleaner, more organized code#90

teamcons merged 7 commits intomainellie-commons/jorts:mainfrom

Better-codeellie-commons/jorts:Better-codeCopy head branch name to clipboard