Code Cleanup

Change-Id: I8aa8fd76ed24562665fd894f4a47bf6b303bd2d5
Merge branch 'master' of https://github.com/Group3-ELEN7045/APS.git