cleaned of comments and debug code