Sources cleanup
Minor improvement
Version bumb