Code cleanup and Figures cleanup
Sound and Final State Fixed