Minor cleanups#27

chughtapan merged 3 commits intomainchughtapan/wags:mainfrom

barbell_cleanupschughtapan/wags:barbell_cleanupsCopy head branch name to clipboard