Code cleanup
Changed optimization level to -O3