Fix mixed code/declarations compiler warnings/errors

Also removed duplicated loops

Change-Id: Ie8eefc8266e4efb23d320411c1a2cd2899e9137d
1 file changed