Code clean, part 1