Some small fixes
Fixed mixed tab and spaces