remove debugging lines
untabify
make indentation more consistent