Bug Fix and Clean