More make commands, trim some whitespace