Some refactoring
Some small fixes
Ch-ch-ch-changes