boost part 2 + some clean