Fixed comments and removed debug output