Adding ICC to makefile and optimizing the file a bit