removed comments and debug info