Cleanup

Cleanup and Optimization.