Fix and Clean

Fix and Clean