Cleaned-up source

Removed debugging code and fixed formatting, i.e., tabs -> spaces...