Code cleanup, part 1
Code cleanup, part 1