Code cleanup. Fixes most of the IDE warnings

Change-Id: Ibeff9a520563f6e1fea3f409ada6f934e98e4814
3 files changed