update
CLean up
update
clean
update
Merge pull request #215 from SUNY-Albany-CCI-INF362/clean-up-2

Clean up 2
Merge pull request #216 from SUNY-Albany-CCI-INF362/master

update