Namespace cleanup
Start at object orienting the code