Removed old, commented code. (#1)
Replaced tabs->spaces.