Finishing touches for optimization