Remove magic numbers from loop, thus fixing more coding style issues.