move to package
updated and normalized description