build cleanups: remove long lines etc.