Finishing retreiving data and clean up code

Signed-off-by: Hui Zheng <hzheng@wpi.edu>
Finishing retriving data and clean up code
Merge branch 'LETUSMERGE' of github.com:Tommzy/wpi-suite into LETUSMERGE