Applying some suggested changes, converting tabs to spaces