Convert tabs to spaces
Minor fixes for better readability
Convert spaces to tabs and code formatting