Refactor and tabs to spaces