removed comments and debug output