changed namespace
reformated code
updated script