Fixes #27. Removed tabs and tidied up a bit.