Fix mistakes and Cleanup