Code cleanup
Code cleanup
Using an object-oriented approach for content manipulation, part 2