Cleanup

Cleaned up some obsolete targets, renamed some variables.
Adjusted some whitespacing.
Do not delete files on clean, instead delete them on distclean.