Removed code "ad personam"

Code polishing