Removed unneeded casts, adapted cycles, reduced scope...

Change-Id: I1781a9d4c42bd6b85f16e9573d0bc2b201084646