Minor cleanup
Added minor gcc optimizations