Fix for issue #165. Some tab formatting and strict mode edits.