Cleanup

As discussed here's the first cleanup branch. Didn't (indent-region) yet, just fixed some issues.