Code cleanup. Distclean advised