Code cleanup + fpu is renabled for tuning..