code cleaning

+ added new script header tags
+ code cleaning