move code from comment