Minor Readability Fixes

Converted tabs to spaces, removed test code, cleaned up a few remaining
conditional logic statement that were clunky.