cleanup source a bit