documentation improved
code cleaned