Trying to implement suggested changes in #202

#202 uses tabs, hopefully this works with spaces.