Stripped trailing spaces, used 4 spaces instead of tabs everywhere