removed comments and debug code