Cleaning
Bunch of chagnes

Some changes that I don't remember why I've made:/