Removed unnecessary else blocks. Fixes #17
More indentation fixing. Fixes #14