Added Completion Sound & Code Cleaning