refactor and some clean ups
Merge branch 'master' of https://github.com/jianc65/ubccpsclibraryapp