Clean variables and some other polish