Convert tabs to spaces, final refactoring from feature-webpgae