[CLEANUP] Move some variables to super class and refactor
Merge branch 'develop' of https://github.com/timohu/HUSACCT into develop