Reduce computational time by removing initialization par loop
Reduce if statement and computational time