small comments and structure change