got rid of 'demo' suffic in header comments. refactoring